bitkeeper revision 1.1691.1.16 (42a7f3f3e6lVJ85_T1bXVdbucWiu9g)

This patch removes -noht option (both code and doc).
Signed-off-by: Nguyen Anh Quynh <aquynh@gmail.com>

diff --git a/docs/src/user.tex b/docs/src/user.tex
index ccaf71b21ebd37f13a6a9dc50d22eee3bff9aa48..b3a2786979b7dbbad453c2f9ce9b8c750dca0948 100644 (file)
--- a/docs/src/user.tex
+++ b/docs/src/user.tex
@@ -1692,9 +1692,6 @@ editing \path{grub.conf}.
 \item [watchdog ] 
  Enable NMI watchdog which can report certain failures. 
 
-\item [noht ] 
- Disable Hyperthreading. 
-
 \item [badpage=$<$page number$>$,$<$page number$>$, \ldots ] 
  Specify a list of pages not to be allocated for use 
  because they contain bad bytes. For example, if your

diff --git a/xen/arch/ia64/xensetup.c b/xen/arch/ia64/xensetup.c
index 413cf66b8983b97567ae76318e4d84dd5667194a..e669ae51e71ef5a0cbc446a5c502a7b42ed25fe1 100644 (file)
--- a/xen/arch/ia64/xensetup.c
+++ b/xen/arch/ia64/xensetup.c
@@ -36,10 +36,6 @@ extern unsigned long domain0_ready;
 int find_max_pfn (unsigned long, unsigned long, void *);
 void start_of_day(void);
 
-/* opt_noht: If true, Hyperthreading is ignored. */
-int opt_noht = 0;
-boolean_param("noht", opt_noht);
-
 /* opt_nosmp: If true, secondary processors are ignored. */
 static int opt_nosmp = 0;
 boolean_param("nosmp", opt_nosmp);

diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index a1818545faa2b5fbacfb0389da6ba2baa168293d..0903967796be1cedddefd93f47e86a5eb12a0109 100644 (file)
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -33,10 +33,6 @@ static unsigned int opt_xenheap_megabytes = XENHEAP_DEFAULT_MB;
 integer_param("xenheap_megabytes", opt_xenheap_megabytes);
 #endif
 
-/* opt_noht: If true, Hyperthreading is ignored. */
-int opt_noht = 0;
-boolean_param("noht", opt_noht);
-
 /* opt_nosmp: If true, secondary processors are ignored. */
 static int opt_nosmp = 0;
 boolean_param("nosmp", opt_nosmp);

diff --git a/xen/include/asm-ia64/config.h b/xen/include/asm-ia64/config.h
index f0e556f69bc92ddd07e9df6e2bb296c481eb4a0c..fbff17469f1343405cb33ea50fc044fb0a60f12d 100644 (file)
--- a/xen/include/asm-ia64/config.h
+++ b/xen/include/asm-ia64/config.h
@@ -225,7 +225,6 @@ struct screen_info { };
 #define FORCE_CRASH()  asm("break 0;;");
 
 // these declarations got moved at some point, find a better place for them
-extern int opt_noht;
 extern int ht_per_core;
 
 // needed for include/xen/smp.h

diff --git a/xen/include/xen/smp.h b/xen/include/xen/smp.h
index 19e91b0fe069889a68c71fc2466f3e0e7ec04dca..20042115890151393c055f40d9493683bf593067 100644 (file)
--- a/xen/include/xen/smp.h
+++ b/xen/include/xen/smp.h
@@ -59,7 +59,6 @@ static inline int on_each_cpu(void (*func) (void *info), void *info,
 }
 
 extern int ht_per_core;
-extern int opt_noht;
 
 extern volatile unsigned long smp_msg_data;
 extern volatile int smp_src_cpu;